Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Team 2 Engineers Feature for Sprint 2 #118

Merged
merged 47 commits into from
Sep 8, 2023
Merged

Team 2 Engineers Feature for Sprint 2 #118

merged 47 commits into from
Sep 8, 2023

Conversation

The-AhmadAA
Copy link
Contributor

This Pull Request will incorporate the 'Engineers' Feature into the main branch, Engineer Feature Ticket

A Summary of what has been implemented is as follows:

  • Creation of 'Engineer' entities behind the main line of defense - These represent the 'humans' in the game. They will tie in directly to the end-state of the game, i.e., when all the engineers are dead, the game will end.
  • Engineer entities scan for mobs in an 'arc'. When they detect mobs, they will move towards the lane the mobs are in and start to fire.
  • Engineers can take damage and die
  • End-state functionality is not yet implemented, it is waiting for end-state dependency work by Team 5.
  • Engineers are intended to spawn in lanes where there are no towers and act as the last line of defense - This is still in progress. Currently the game starts with 4 engineers spawned into specific positions on the map grid.
  • This pull request includes changes to the PhysicalLayers that changes the PLAYER layer into ENGINEER, adds a TOWER layer and a HUMANS layer that includes both ENGINEER and TOWER.

praneetdhoolia and others added 30 commits September 4, 2023 16:46
@praneetdhoolia
Added EngineerConfig with basic attributes for Engineer Entity.
b13b149
@praneetdhoolia
Added EngineerConfig for storing basic Engineer entity attributes and…
0e9fb05 
… EngineerFactory to produce Engineer entities.
@The-AhmadAA
created skeleton engineer animation controller class
c6817e9
@The-AhmadAA
added initial engineer assets
afeb869
@The-AhmadAA
added more engineer visual assets, updated animationcontroller
3f56d28
@The-AhmadAA
updated engineer visual assets
a8ea714
@The-AhmadAA
added firing sounds, update animationController
382f4ae
@The-AhmadAA
created Engineer Factory class
5663ba6
@The-AhmadAA
created human version of WanderTask with subtasks
aa05c31
@The-AhmadAA
created EngineerConfigs class
000847c
@The-AhmadAA
added Engineers.json config file
6cc7e0e
@praneetdhoolia
Created EngineerCombatTask, modified EngineerFactory to accommodate E…
081d9b2 
…ngineer.json config.
@praneetdhoolia
Pulled changes from Ahmad's branch.
25ade84
@praneetdhoolia
Pulled changes from Ahmad's branch.
81f1d2f
@praneetdhoolia
Testing Engineer Entity
443c67a
@The-AhmadAA
removed unused sound effects assets, updated comment
c9a9e91
@The-AhmadAA
added scale constants, updated wanderTask range
9f11e53
@The-AhmadAA
created human specific CombatStatsComponent, and updated references
962650a
@The-AhmadAA
added Override decorator, removed ununsed imports and variables
d5dd3d4
@The-AhmadAA
update changes
4ff5b0a
@praneetdhoolia
Added Shooting Functionality to Engineers.
e3b92aa
@The-AhmadAA
removed unused imports
7a97d53
@The-AhmadAA
re-enabled checkAndDeleteBodies, Engineers now die
9d10e9e
@The-AhmadAA
added hit event triggering in hit methods
9958c1c
@The-AhmadAA
added null checking in checkAndDeleteBodies
8317df9
@The-AhmadAA
modified engineers to take damage and die
27e18c6
@The-AhmadAA
commented checkAndDeleteBodies out for investigation of alternative a…
354b55f 
…pproach
@The-AhmadAA
Merge pull request #102 from UQcsse3200/main
7e15eab 
Merging main into Engineers Branch
@The-AhmadAA
Merge remote-tracking branch 'origin/Team-2--Engineers' into Team-2-e…
a7fca4a 
…ngineers-ahmad
@The-AhmadAA
Merge pull request #103 from UQcsse3200/Team-2-engineers-ahmad
994758f 
Team 2 engineers ahmad
The-AhmadAA and others added 13 commits September 7, 2023 21:55
@The-AhmadAA
modified EngineerCombatTask target scanning and integrated into Human…
f95d5d7 
…WanderTask
@The-AhmadAA
modified EngineerFactory to add integrated HumanWanderTask
5811775
@The-AhmadAA
modified ProjectileFactory for testing purposes.
fb36e25
@The-AhmadAA
removed unnecessary target arg in EngineerFactory
120dd79
@The-AhmadAA
added tests to EngineerFactoryTest
bfc544d
@The-AhmadAA
merging changes from main into Team-2-engineers-ahmad
b8982f4
@The-AhmadAA
fixed merge conflicts from merging main into Team-2-engineers-ahmad
a811432
@The-AhmadAA
Merge pull request #114 from UQcsse3200/Team-2-engineers-ahmad
46ab5d2 
Team 2 engineers ahmad
@The-AhmadAA
minor fixes to human combat tasks to fix missing projectiles
ca8e48e
@The-AhmadAA
added more engineer animations
6c17533
@The-AhmadAA
updated engineer classes to use a new animation and event types
d198eeb
@The-AhmadAA
updated ForestGameArea to spawn a fixed number of engineers
b2d7462
@The-AhmadAA
fixes to engineer firing animations
7772795
@The-AhmadAA The-AhmadAA added this to the Sprint 2 milestone Sep 8, 2023
@The-AhmadAA The-AhmadAA self-assigned this Sep 8, 2023
Hasakev
Hasakev reviewed Sep 8, 2023
View reviewed changes
Copy link
Contributor

@Hasakev Hasakev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

may need some comments for HumanAnimationController.java and EngineerCombatTask.java

Not too sure if the tests were left empty intentionally (see HumanWanderTaskTest.java and HumanMovementTaskTest.java)

Everything else looks nice and clean. Thanks for the carry again :)

@The-AhmadAA
Copy link
Contributor Author

may need some comments for HumanAnimationController.java and EngineerCombatTask.java

Not too sure if the tests were left empty intentionally (see HumanWanderTaskTest.java and HumanMovementTaskTest.java)

Everything else looks nice and clean. Thanks for the carry again :)

Thanks for the review @Hasakev, we'll add some comments and tests in upcoming commits.

@ryandmcneilly ryandmcneilly merged commit e876539 into main Sep 8, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Hasakev Hasakev Hasakev left review comments

@gregchan550 gregchan550 Awaiting requested review from gregchan550

@ryandmcneilly ryandmcneilly Awaiting requested review from ryandmcneilly

@samsully samsully Awaiting requested review from samsully

@JSLLW JSLLW Awaiting requested review from JSLLW

@cindyle1 cindyle1 Awaiting requested review from cindyle1

@fattyhope fattyhope Awaiting requested review from fattyhope

Assignees

@The-AhmadAA The-AhmadAA

Labels
enhancement New feature or request sprint 2 task team 2
Projects
2023 Studio 3 Project
Status: Done
Milestone
Sprint 2
Development

Successfully merging this pull request may close these issues.
4 participants
@The-AhmadAA @Hasakev @ryandmcneilly @praneetdhoolia